From 4f27f31a471d94f55a39bc9a3eb02ca777112f59 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Wed, 21 Dec 2005 20:18:19 +0100 Subject: [PATCH] Remove acpi_count_madt functions. Only appear to be used for diagnostic tracing in xen/ia64. Signed-off-by: Keir Fraser --- xen/arch/ia64/xen/acpi.c | 9 ------- xen/drivers/acpi/tables.c | 57 --------------------------------------- xen/include/xen/acpi.h | 1 - 3 files changed, 67 deletions(-) diff --git a/xen/arch/ia64/xen/acpi.c b/xen/arch/ia64/xen/acpi.c index d307c44a52..7c296dd7c7 100644 --- a/xen/arch/ia64/xen/acpi.c +++ b/xen/arch/ia64/xen/acpi.c @@ -604,17 +604,8 @@ acpi_boot_init (void) if (acpi_table_parse_madt(ACPI_MADT_LAPIC_ADDR_OVR, acpi_parse_lapic_addr_ovr, 0) < 0) printk(KERN_ERR PREFIX "Error parsing LAPIC address override entry\n"); -#ifdef CONFIG_SMP - int count; - if ((count = acpi_table_count_madt(ACPI_MADT_LSAPIC)) < 1) { - printk(KERN_ERR PREFIX "Error parsing MADT - no LSAPIC entries\n"); - } else { - acpi_table_parse_madt(ACPI_MADT_LSAPIC, acpi_parse_lsapic, count); - } -#else if (acpi_table_parse_madt(ACPI_MADT_LSAPIC, acpi_parse_lsapic, NR_CPUS) < 1) printk(KERN_ERR PREFIX "Error parsing MADT - no LSAPIC entries\n"); -#endif if (acpi_table_parse_madt(ACPI_MADT_LAPIC_NMI, acpi_parse_lapic_nmi, 0) < 0) printk(KERN_ERR PREFIX "Error parsing LAPIC NMI entry\n"); diff --git a/xen/drivers/acpi/tables.c b/xen/drivers/acpi/tables.c index 837aa0d321..1c718efc88 100644 --- a/xen/drivers/acpi/tables.c +++ b/xen/drivers/acpi/tables.c @@ -607,60 +607,3 @@ acpi_table_init (void) return 0; } - -int __init -acpi_table_count_madt_family ( - enum acpi_table_id id, - unsigned long madt_size, - int entry_id) -{ - void *madt = NULL; - acpi_table_entry_header *entry; - unsigned int count = 0; - unsigned long madt_end; - unsigned int i; - - /* Locate the MADT (if exists). There should only be one. */ - - for (i = 0; i < sdt_count; i++) { - if (sdt_entry[i].id != id) - continue; - madt = (void *) - __acpi_map_table(sdt_entry[i].pa, sdt_entry[i].size); - if (!madt) { - printk(KERN_WARNING PREFIX "Unable to map %s\n", - acpi_table_signatures[id]); - return -ENODEV; - } - break; - } - - if (!madt) { - printk(KERN_WARNING PREFIX "%s not present\n", - acpi_table_signatures[id]); - return -ENODEV; - } - - madt_end = (unsigned long) madt + sdt_entry[i].size; - - /* Parse all entries looking for a match. */ - - entry = (acpi_table_entry_header *) - ((unsigned long) madt + madt_size); - - while (((unsigned long) entry) + sizeof(acpi_table_entry_header) < madt_end) { - if (entry->type == entry_id) count++; - - entry = (acpi_table_entry_header *) - ((unsigned long) entry + entry->length); - } - - return count; -} - - -int __init -acpi_table_count_madt (enum acpi_madt_entry_id id) -{ - return acpi_table_count_madt_family(ACPI_APIC, sizeof(struct acpi_table_madt), id); -} diff --git a/xen/include/xen/acpi.h b/xen/include/xen/acpi.h index f8e3a1bdef..b84f047651 100644 --- a/xen/include/xen/acpi.h +++ b/xen/include/xen/acpi.h @@ -390,7 +390,6 @@ int acpi_table_parse_srat (enum acpi_srat_entry_id id, acpi_madt_entry_handler h void acpi_table_print (struct acpi_table_header *header, unsigned long phys_addr); void acpi_table_print_madt_entry (acpi_table_entry_header *madt); void acpi_table_print_srat_entry (acpi_table_entry_header *srat); -int acpi_table_count_madt (enum acpi_madt_entry_id id); /* the following four functions are architecture-dependent */ void acpi_numa_slit_init (struct acpi_table_slit *slit); -- 2.30.2